Move to upstream mockery #4937
Merged
Move to upstream mockery #4937
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
dosubot
bot
added
size:L
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4937 +/- ##
==========================================
- Coverage 61.10% 61.08% -0.02%
==========================================
Files 793 793
Lines 51156 51156
==========================================
- Hits 31257 31251 -6
- Misses 17027 17033 +6
Partials 2872 2872
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Signed-off-by: Eduardo Apolinario <[email protected]>
|
Once #5134 is merged I'm going to update this PR. |
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
This reverts commit 9f7d745. Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
Signed-off-by: Eduardo Apolinario <[email protected]>
|
codespell CI check is being fixed in #5418. |
andrewwdye
approved these changes
May 24, 2024
| # If tool is named vektra/mockery/v2, we need to rename the binary to mockery-v2 | ||
| if [[ $tool == "github.com/vektra/mockery/[email protected]" ]]; then | ||
| echo "Renaming mockery to mockery-v2" | ||
| mv $(go env GOPATH)/bin/mockery $(go env GOPATH)/bin/mockery-v2 |
There was a problem hiding this comment.
Depending on the timeline to manage the migration, do you know of a linter that would let us block new usage of go:generate mockery? I was looking at forbidigo, but I don't see a file exclusion
There was a problem hiding this comment.
Good idea, although in the case of forbidigo it looks like it can't handle comments. In any case, I'm going to experiment with this in a separate PR. Maybe there's a way to restrict the linter to files in a PR (this might involve running a command via a run block in a gh action to list the go files in a PR, something like git diff --name-only master | grep '.go$' and pass that list to this tool).
3 tasks
robert-ulbrich-mercedes-benz
pushed a commit
to robert-ulbrich-mercedes-benz/flyte
that referenced
this pull request
Jul 2, 2024
* Switch to vektra/mockery Signed-off-by: Eduardo Apolinario <[email protected]> * Add support for both versions of mockery to coexist Signed-off-by: Eduardo Apolinario <[email protected]> * Fix a few typos Signed-off-by: Eduardo Apolinario <[email protected]> * Rename binaries to reflect their sources Signed-off-by: Eduardo Apolinario <[email protected]> * Add missing pflags binary Signed-off-by: Eduardo Apolinario <[email protected]> * Install upstream mockery in boilerplate Signed-off-by: Eduardo Apolinario <[email protected]> * Add example in flyteadmin Signed-off-by: Eduardo Apolinario <[email protected]> * Rename to mockery-v2 Signed-off-by: Eduardo Apolinario <[email protected]> * Move WorkflowExecutor to mockery-v2 Signed-off-by: Eduardo Apolinario <[email protected]> * Revert "Move WorkflowExecutor to mockery-v2" This reverts commit 9f7d745. Signed-off-by: Eduardo Apolinario <[email protected]> * Revert changes to executor Signed-off-by: Eduardo Apolinario <[email protected]> * Modify SignalInterface to use mockery-v2 Signed-off-by: Eduardo Apolinario <[email protected]> --------- Signed-off-by: Eduardo Apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tracking issue
#4934
Why are the changes needed?
Harder to contribute code for newer contributors and the codebase don't get upstream changes
What changes were proposed in this pull request?
In order to facilitate the migration to
vektra/mockery, this PR sets up an environment where both versions of mockery are available. The current use of mockery is kept, and we can start moving to upstream mockery mock by mock, by switching to usingmockery-v2binary in the//go:generatedirective, e.g.//go:generate mockery-v2 ...(notice that flags are passed using--, not-).I added one example in flyteadmin. Notice how the call to generate the mock is slightly different
SignalInterface:Notice the need to add
--with-expecterin order to generate expecter structs.How was this patch tested?
Setup process
Screenshots
Check all the applicable boxes
Related PRs
Docs link